; Merge from origin/emacs-29
authorEli Zaretskii <eliz@gnu.org>
Sat, 3 Feb 2024 11:40:08 +0000 (06:40 -0500)
committerEli Zaretskii <eliz@gnu.org>
Sat, 3 Feb 2024 11:40:08 +0000 (06:40 -0500)
The following commits were skipped:

c22d0ae2dd8 Fix "emacs -nw" on MS-Windows
396b49871aa ; Fix last change in package.texi


Trivial merge